Autogenerated HTML docs for v1.7.4.1-225-g83c3c
diff --git a/git-commit.html b/git-commit.html index a3f1069..2ee36c7 100644 --- a/git-commit.html +++ b/git-commit.html
@@ -542,9 +542,10 @@ </dt> <dd> <p> - When used with -C/-c/--amend options, declare that the - authorship of the resulting commit now belongs of the committer. - This also renews the author timestamp. + When used with -C/-c/--amend options, or when committing after a + a conflicting cherry-pick, declare that the authorship of the + resulting commit now belongs of the committer. This also renews + the author timestamp. </p> </dd> <dt class="hdlist1"> @@ -1123,7 +1124,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2011-02-22 07:51:12 UTC +Last updated 2011-03-10 01:17:52 UTC </div> </div> </body>
